API: Remove colormap handling from GdkScreen
authorBenjamin Otte <otte@redhat.com>
Sun, 29 Aug 2010 10:51:07 +0000 (12:51 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 26 Sep 2010 13:11:34 +0000 (15:11 +0200)
In particular, the following functions are gone:
- gdk_screen_get_default_colormap()
- gdk_screen_set_default_colormap()
- gdk_screen_get_system_colormap()
- gdk_screen_get_rgba_colormap()

16 files changed:
docs/reference/gdk/gdk3-sections.txt
gdk/gdk.symbols
gdk/gdkcolor.c
gdk/gdkcolor.h
gdk/gdkscreen.c
gdk/gdkscreen.h
gdk/quartz/gdkcolor-quartz.c
gdk/quartz/gdkscreen-quartz.c
gdk/quartz/gdkscreen-quartz.h
gdk/win32/gdkcolor-win32.c
gdk/win32/gdkdisplay-win32.c
gdk/win32/gdkscreen-win32.c
gdk/x11/gdkcolor-x11.c
gdk/x11/gdkscreen-x11.c
gdk/x11/gdkscreen-x11.h
gdk/x11/gdkwindow-x11.c

index e3e651f030584261cbeef77aa579e436ca4f6b9d..632b2fbd58cc332bebb7901ee103c74acf45cef7 100644 (file)
@@ -190,11 +190,7 @@ gdk_display_manager_get_type
 <TITLE>GdkScreen</TITLE>
 GdkScreen
 gdk_screen_get_default
-gdk_screen_get_default_colormap
-gdk_screen_set_default_colormap
-gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
-gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_is_composited
 gdk_screen_get_root_window
@@ -253,7 +249,6 @@ gdk_pixbuf_get_from_surface
 GdkColor
 GdkColormap
 gdk_colormap_new
-gdk_colormap_get_system
 gdk_colormap_alloc_colors
 gdk_colormap_alloc_color
 gdk_colormap_free_colors
index 9264ce1d163285659c83aa89f0de430ea3edb38e..8a2a1d9c31addaa6ae2674325efc65522a5912ce 100644 (file)
@@ -305,7 +305,6 @@ gdk_color_free
 gdk_color_get_type G_GNUC_CONST
 gdk_color_hash
 gdk_colormap_alloc_color
-gdk_colormap_get_system
 gdk_colormap_get_visual
 gdk_color_parse
 gdk_color_to_string
@@ -847,14 +846,11 @@ gdk_screen_get_number
 gdk_screen_get_primary_monitor
 gdk_screen_get_root_window
 gdk_screen_get_setting
-gdk_screen_get_default_colormap
-gdk_screen_set_default_colormap
 gdk_screen_get_n_monitors
 gdk_screen_get_monitor_geometry
 gdk_screen_get_monitor_width_mm
 gdk_screen_get_monitor_height_mm
 gdk_screen_get_monitor_plug_name
-gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
@@ -863,12 +859,6 @@ gdk_screen_make_display_name
 #endif
 #endif
 
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_COLOR_X11_C__)
-gdk_screen_get_system_colormap
-#endif
-#endif
-
 #if IN_HEADER(__GDK_SELECTION_H__)
 #if IN_FILE(__GDK_SELECTION_C__)
 gdk_selection_owner_set
index 69f70c56e34ec10dd123f56e8687d9e00236e108..ce5c89cab7bfa2c62ae8133f5ed1a4f7befe6623 100644 (file)
@@ -224,17 +224,3 @@ gdk_color_to_string (const GdkColor *color)
 
   return pango_color_to_string (&pango_color);
 }
-
-/**
- * gdk_colormap_get_system:
- * 
- * Gets the system's default colormap for the default screen. (See
- * gdk_colormap_get_system_for_screen ())
- * 
- * Return value: the default colormap.
- **/
-GdkColormap*
-gdk_colormap_get_system (void)
-{
-  return gdk_screen_get_system_colormap (gdk_screen_get_default ());
-}
index dfb21cd6c65834475bfe68edc52c0c7661fd9f3a..d531cbe6b067d392e691c95eef6db4fca27ad024 100644 (file)
@@ -91,10 +91,6 @@ GType        gdk_colormap_get_type (void) G_GNUC_CONST;
 GdkColormap* gdk_colormap_new    (GdkVisual   *visual,
                                   gboolean     allocate);
 
-#ifndef GDK_MULTIHEAD_SAFE
-GdkColormap* gdk_colormap_get_system           (void);
-#endif
-
 GdkScreen *gdk_colormap_get_screen (GdkColormap *cmap);
 
 gint  gdk_colormap_alloc_colors   (GdkColormap    *colormap,
index ac56f203d0b34d6a595a141bb1efd4d9521b9e47..c7d6593da6b29e219c2ca6e1afd4c04fd093f39f 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "config.h"
 #include "gdk.h"               /* For gdk_rectangle_intersect() */
-#include "gdkcolor.h"
 #include "gdkwindow.h"
 #include "gdkscreen.h"
 #include "gdkintl.h"
index 0f0e4ce91f5eda8f28d61b7bc40c0a6c7039add9..9e1e606e8dd054553a8d25817efe5ce057fa2b89 100644 (file)
@@ -63,12 +63,7 @@ struct _GdkScreenClass
 };
 
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
-GdkColormap *gdk_screen_get_default_colormap  (GdkScreen   *screen);
-void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
-                                              GdkColormap *colormap);
-GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
 GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
 gboolean     gdk_screen_is_composited        (GdkScreen   *screen);
 
index c0addafb933d35921b8f68f782dff32680454364..ec8335c3bbc4b063d9479e62cb2db3fb0f840e6f 100644 (file)
@@ -62,43 +62,6 @@ gdk_colormap_new (GdkVisual *visual,
   return NULL;
 }
 
-GdkColormap *
-gdk_screen_get_system_colormap (GdkScreen *screen)
-{
-  static GdkColormap *colormap = NULL;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  if (!colormap)
-    {
-      colormap = g_object_new (GDK_TYPE_COLORMAP, NULL);
-
-      colormap->visual = gdk_visual_get_system ();
-      colormap->size = colormap->visual->colormap_size;
-    }
-
-  return colormap;
-}
-
-
-GdkColormap *
-gdk_screen_get_rgba_colormap (GdkScreen *screen)
-{
-  static GdkColormap *colormap = NULL;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  if (!colormap)
-    {
-      colormap = g_object_new (GDK_TYPE_COLORMAP, NULL);
-
-      colormap->visual = gdk_screen_get_rgba_visual (screen);
-      colormap->size = colormap->visual->colormap_size;
-    }
-
-  return colormap;
-}
-
 void
 gdk_colormap_free_colors (GdkColormap    *colormap,
                           const GdkColor *colors,
index 796fcb59287d5e1612871bf07de47ff86e53e5e4..d90366e91dd4b0925e0d3d2adc0043c3048931ed 100644 (file)
@@ -84,9 +84,6 @@ _gdk_screen_quartz_init (GdkScreenQuartz *screen_quartz)
   GdkScreen *screen = GDK_SCREEN (screen_quartz);
   NSScreen *nsscreen;
 
-  gdk_screen_set_default_colormap (screen,
-                                   gdk_screen_get_system_colormap (screen));
-
   nsscreen = [[NSScreen screens] objectAtIndex:0];
   gdk_screen_set_resolution (screen,
                              72.0 * [nsscreen userSpaceScaleFactor]);
@@ -104,12 +101,6 @@ gdk_screen_quartz_dispose (GObject *object)
 {
   GdkScreenQuartz *screen = GDK_SCREEN_QUARTZ (object);
 
-  if (screen->default_colormap)
-    {
-      g_object_unref (screen->default_colormap);
-      screen->default_colormap = NULL;
-    }
-
   if (screen->screen_changed_id)
     {
       g_source_remove (screen->screen_changed_id);
@@ -313,31 +304,6 @@ _gdk_windowing_substitute_screen_number (const gchar *display_name,
   return g_strdup (display_name);
 }
 
-GdkColormap*
-gdk_screen_get_default_colormap (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_QUARTZ (screen)->default_colormap;
-}
-
-void
-gdk_screen_set_default_colormap (GdkScreen   *screen,
-                                GdkColormap *colormap)
-{
-  GdkColormap *old_colormap;
-  
-  g_return_if_fail (GDK_IS_SCREEN (screen));
-  g_return_if_fail (GDK_IS_COLORMAP (colormap));
-
-  old_colormap = GDK_SCREEN_QUARTZ (screen)->default_colormap;
-
-  GDK_SCREEN_QUARTZ (screen)->default_colormap = g_object_ref (colormap);
-  
-  if (old_colormap)
-    g_object_unref (old_colormap);
-}
-
 gint
 gdk_screen_get_width (GdkScreen *screen)
 {
index 82da95cf1c2f02ec42a69b92081ce74879b94023..4d211e3828b71390d80d06f4dd5f300ea9844361 100644 (file)
@@ -38,7 +38,6 @@ struct _GdkScreenQuartz
   GdkScreen parent_instance;
 
   GdkDisplay *display;
-  GdkColormap *default_colormap;
 
   /* Origin of "root window" in Cocoa coordinates */
   gint min_x;
index 08a16b8e0c739faa68087985b7546f38d7968b6a..dfb986c8d08e18ff577d69887d2b5ea519a8c055 100644 (file)
@@ -590,53 +590,6 @@ gdk_colormap_new (GdkVisual *visual,
   return colormap;
 }
 
-GdkColormap*
-gdk_screen_get_system_colormap (GdkScreen *screen)
-{
-  static GdkColormap *colormap = NULL;
-  GdkColormapPrivateWin32 *private;
-
-  g_return_val_if_fail (screen == _gdk_screen, NULL);
-
-  if (!colormap)
-    {
-      colormap = g_object_new (gdk_colormap_get_type (), NULL);
-      private = GDK_WIN32_COLORMAP_DATA (colormap);
-
-      colormap->visual = gdk_visual_get_system ();
-
-      colormap->size = colormap->visual->colormap_size;
-
-      private->private_val = FALSE;
-
-      switch (colormap->visual->type)
-       {
-       case GDK_VISUAL_GRAYSCALE:
-       case GDK_VISUAL_PSEUDO_COLOR:
-         private->info = g_new0 (GdkColorInfo, colormap->size);
-         private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
-                                           (GEqualFunc) gdk_color_equal);
-         /* Fallthrough */
-
-       case GDK_VISUAL_STATIC_GRAY:
-       case GDK_VISUAL_STATIC_COLOR:
-         create_colormap (colormap, FALSE);
-
-         colormap->colors = g_new (GdkColor, colormap->size);
-         sync_colors (colormap);
-         break;
-
-       case GDK_VISUAL_TRUE_COLOR:
-         break;
-
-       default:
-         g_assert_not_reached ();
-       }
-    }
-
-  return colormap;
-}
-
 static void
 gdk_colors_free (GdkColormap *colormap,
                 gulong      *in_pixels,
index 3295353ec5aeb3597c7306ec2669f7c6efb110bf..3d43c26ddd2d1a3ce4188a50611bfd54738b35a9 100644 (file)
@@ -204,8 +204,6 @@ gdk_display_open (const gchar *display_name)
 
   _gdk_monitor_init ();
   _gdk_visual_init ();
-  gdk_screen_set_default_colormap (_gdk_screen,
-                                   gdk_screen_get_system_colormap (_gdk_screen));
   _gdk_windowing_window_init (_gdk_screen);
   _gdk_events_init ();
   _gdk_input_init (_gdk_display);
index e9051b50d44e96a463f65281da78d6ff058f9b68..047e948b456d65f379c72611b24c2bc1256eacbf 100644 (file)
@@ -21,8 +21,6 @@
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 
-static GdkColormap *default_colormap = NULL;
-
 GdkDisplay *
 gdk_screen_get_display (GdkScreen *screen)
 {
@@ -35,29 +33,6 @@ gdk_screen_get_root_window (GdkScreen *screen)
   return _gdk_root;
 }
 
-GdkColormap *
-gdk_screen_get_default_colormap (GdkScreen *screen)
-{
-  return default_colormap;
-}
-
-void
-gdk_screen_set_default_colormap (GdkScreen   *screen,
-                                GdkColormap *colormap)
-{
-  GdkColormap *old_colormap;
-  
-  g_return_if_fail (screen == _gdk_screen);
-  g_return_if_fail (GDK_IS_COLORMAP (colormap));
-
-  old_colormap = default_colormap;
-
-  default_colormap = g_object_ref (colormap);
-  
-  if (old_colormap)
-    g_object_unref (old_colormap);
-}
-
 gint
 gdk_screen_get_n_monitors (GdkScreen *screen)
 {
@@ -119,14 +94,6 @@ gdk_screen_get_monitor_geometry (GdkScreen    *screen,
   *dest = _gdk_monitors[num_monitor].rect;
 }
 
-GdkColormap *
-gdk_screen_get_rgba_colormap (GdkScreen *screen)
-{
-  g_return_val_if_fail (screen == _gdk_screen, NULL);
-
-  return NULL;
-}
-  
 GdkVisual *
 gdk_screen_get_rgba_visual (GdkScreen *screen)
 {
index dba39d9e8d649f2ef2c2dfa299171f30c2e8bd08..848dcc2a41ad676e8d4cbeb58f4238f5b27316fe 100644 (file)
@@ -348,69 +348,6 @@ gdk_colormap_sync (GdkColormap *colormap,
     gdk_colormap_sync_palette (colormap);
 }
                   
-/**
- * gdk_screen_get_system_colormap:
- * @screen: a #GdkScreen
- *
- * Gets the system's default colormap for @screen
- *
- * Returns: (transfer none): the default colormap for @screen.
- *
- * Since: 2.2
- */
-GdkColormap *
-gdk_screen_get_system_colormap (GdkScreen *screen)
-{
-  GdkColormap *colormap = NULL;
-  GdkColormapPrivateX11 *private;
-  GdkScreenX11 *screen_x11;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-  screen_x11 = GDK_SCREEN_X11 (screen);
-
-  if (screen_x11->system_colormap)
-    return screen_x11->system_colormap;
-
-  colormap = g_object_new (GDK_TYPE_COLORMAP, NULL);
-  private = GDK_COLORMAP_PRIVATE_DATA (colormap);
-
-  private->screen = screen;
-  colormap->visual = gdk_screen_get_system_visual (screen);
-  
-  private->xcolormap = DefaultColormapOfScreen (screen_x11->xscreen);
-  private->private_val = FALSE;
-
-  private->hash = NULL;
-  private->last_sync_time = 0;
-  private->info = NULL;
-
-  colormap->colors = NULL;
-  colormap->size = colormap->visual->colormap_size;
-
-  switch (colormap->visual->type)
-    {
-    case GDK_VISUAL_GRAYSCALE:
-    case GDK_VISUAL_PSEUDO_COLOR:
-      private->info = g_new0 (GdkColorInfo, colormap->size);
-      private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
-                                       (GEqualFunc) gdk_color_equal);
-      /* Fall through */
-    case GDK_VISUAL_STATIC_GRAY:
-    case GDK_VISUAL_STATIC_COLOR:
-    case GDK_VISUAL_DIRECT_COLOR:
-      colormap->colors = g_new (GdkColor, colormap->size);
-      gdk_colormap_sync (colormap, TRUE);
-      
-    case GDK_VISUAL_TRUE_COLOR:
-      break;
-    }
-  
-  gdk_colormap_add (colormap);
-  screen_x11->system_colormap = colormap;
-  
-  return colormap;
-}
-
 /*
  * gdk_colormap_change:
  * @colormap: a #GdkColormap.
@@ -1039,10 +976,6 @@ gdk_x11_colormap_foreign_new (GdkVisual *visual,
 
   screen = gdk_visual_get_screen (visual);
   
-  if (xcolormap == DefaultColormap (GDK_SCREEN_XDISPLAY (screen),
-                                   GDK_SCREEN_XNUMBER (screen)))
-    return g_object_ref (gdk_screen_get_system_colormap (screen));
-
   colormap = gdk_colormap_lookup (screen, xcolormap);
   if (colormap)
     return g_object_ref (colormap);
index 301b09905c5959265dbda92b18863f0e7ffc31ca..004011ab580a766a8092544859e63ef7c42f9a35 100644 (file)
@@ -237,50 +237,6 @@ gdk_screen_get_root_window (GdkScreen *screen)
   return GDK_SCREEN_X11 (screen)->root_window;
 }
 
-/**
- * gdk_screen_get_default_colormap:
- * @screen: a #GdkScreen
- *
- * Gets the default colormap for @screen.
- * 
- * Returns: (transfer none): the default #GdkColormap.
- *
- * Since: 2.2
- **/
-GdkColormap *
-gdk_screen_get_default_colormap (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_X11 (screen)->default_colormap;
-}
-
-/**
- * gdk_screen_set_default_colormap:
- * @screen: a #GdkScreen
- * @colormap: a #GdkColormap
- *
- * Sets the default @colormap for @screen.
- *
- * Since: 2.2
- **/
-void
-gdk_screen_set_default_colormap (GdkScreen   *screen,
-                                GdkColormap *colormap)
-{
-  GdkColormap *old_colormap;
-  
-  g_return_if_fail (GDK_IS_SCREEN (screen));
-  g_return_if_fail (GDK_IS_COLORMAP (colormap));
-
-  old_colormap = GDK_SCREEN_X11 (screen)->default_colormap;
-
-  GDK_SCREEN_X11 (screen)->default_colormap = g_object_ref (colormap);
-  
-  if (old_colormap)
-    g_object_unref (old_colormap);
-}
-
 static void
 _gdk_screen_x11_events_uninit (GdkScreen *screen)
 {
@@ -310,24 +266,6 @@ gdk_screen_x11_dispose (GObject *object)
 
   _gdk_screen_x11_events_uninit (GDK_SCREEN (object));
 
-  if (screen_x11->default_colormap)
-    {
-      g_object_unref (screen_x11->default_colormap);
-      screen_x11->default_colormap = NULL;
-    }
-
-  if (screen_x11->system_colormap)
-    {
-      g_object_unref (screen_x11->system_colormap);
-      screen_x11->system_colormap = NULL;
-    }
-
-  if (screen_x11->rgba_colormap)
-    {
-      g_object_unref (screen_x11->rgba_colormap);
-      screen_x11->rgba_colormap = NULL;
-    }
-
   if (screen_x11->root_window)
     _gdk_window_destroy (screen_x11->root_window, TRUE);
 
@@ -538,11 +476,11 @@ gdk_screen_get_monitor_geometry (GdkScreen    *screen,
 }
 
 /**
- * gdk_screen_get_rgba_colormap:
- * @screen: a #GdkScreen.
+ * gdk_screen_get_rgba_visual:
+ * @screen: a #GdkScreen
  * 
- * Gets a colormap to use for creating windows with an alpha
- * channel. The windowing system on which GTK+ is running
+ * Gets a visual to use for creating windows with an alpha channel.
+ * The windowing system on which GTK+ is running
  * may not support this capability, in which case %NULL will
  * be returned. Even if a non-%NULL value is returned, its
  * possible that the window's alpha channel won't be honored
@@ -554,37 +492,6 @@ gdk_screen_get_monitor_geometry (GdkScreen    *screen,
  *
  * For setting an overall opacity for a top-level window, see
  * gdk_window_set_opacity().
-
- * Return value: (transfer none): a colormap to use for windows with
- *     an alpha channel or %NULL if the capability is not available.
- *
- * Since: 2.8
- **/
-GdkColormap *
-gdk_screen_get_rgba_colormap (GdkScreen *screen)
-{
-  GdkScreenX11 *screen_x11;
-
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  screen_x11 = GDK_SCREEN_X11 (screen);
-
-  if (!screen_x11->rgba_visual)
-    return NULL;
-
-  if (!screen_x11->rgba_colormap)
-    screen_x11->rgba_colormap = gdk_colormap_new (screen_x11->rgba_visual,
-                                                 FALSE);
-  
-  return screen_x11->rgba_colormap;
-}
-
-/**
- * gdk_screen_get_rgba_visual:
- * @screen: a #GdkScreen
- * 
- * Gets a visual to use for creating windows with an alpha channel.
- * See the docs for gdk_screen_get_rgba_colormap() for caveats.
  * 
  * Return value: (transfer none): a visual to use for windows with an
  *     alpha channel or %NULL if the capability is not available.
index 81662e2390874c4e9acef5d48843a091fe804bb1..b0c6303903172d30320e514c63cddd0136fad0dc 100644 (file)
@@ -81,11 +81,6 @@ struct _GdkScreenX11
   GHashTable *colormap_hash;
   GdkVisual *rgba_visual;
   
-  /* Colormap Part */
-  GdkColormap *default_colormap;
-  GdkColormap *system_colormap;
-  GdkColormap *rgba_colormap;
-
   /* X settings */
   XSettingsClient *xsettings_client;
   guint xsettings_in_init : 1;
index 7b338bf72b4b360f0fef53c878afdae409c33219..d653151271e1e79956633d3e6c3402531e916a27 100644 (file)
@@ -429,9 +429,6 @@ _gdk_windowing_window_init (GdkScreen * screen)
 
   g_assert (screen_x11->root_window == NULL);
 
-  gdk_screen_set_default_colormap (screen,
-                                  gdk_screen_get_system_colormap (screen));
-
   screen_x11->root_window = g_object_new (GDK_TYPE_WINDOW, NULL);
 
   private = (GdkWindowObject *) screen_x11->root_window;